projects / xen.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 495cd7d)
bitkeeper revision 1.1108.5.2 (40fcfc3d1HOefeaUA-YZdx66NSVvqA)
authortw275@labyrinth.cl.cam.ac.uk <tw275@labyrinth.cl.cam.ac.uk>
Tue, 20 Jul 2004 11:04:29 +0000 (11:04 +0000)
committertw275@labyrinth.cl.cam.ac.uk <tw275@labyrinth.cl.cam.ac.uk>
Tue, 20 Jul 2004 11:04:29 +0000 (11:04 +0000)
Trying to get my new web interfae to install correctly

.rootkeys patch | blob | history
tools/python/setup.py patch | blob | history
tools/python/xen/xend/sv/HTMLBase.py patch | blob | history
tools/python/xen/xend/sv/inc/bottom.htm [deleted file] patch | blob | history
tools/python/xen/xend/sv/inc/top.htm [deleted file] patch | blob | history

diff --git a/.rootkeys b/.rootkeys
index 40189aedaa32a0a2a118579f81a22cba8ca7005c..a0d47907cde009a0c57fb5c1ec2f48c96c937936 100644 (file)
--- a/.rootkeys
+++ b/.rootkeys
@@ -390,9 +390,7 @@
 40fcefb3dgsa24WLk_BJeYQHrDLuOg tools/python/xen/xend/sv/images/seperator-right-highlight.jpg
 40fcefb3FtiX4Pd2kT8wDlp8u8xRhQ tools/python/xen/xend/sv/images/seperator.jpg
 40fcefb3yMSrZvApO9ToIi-iQwnchA tools/python/xen/xend/sv/images/xen.png
-40fcefb310mW7U0p7JMoBQVnjf76xg tools/python/xen/xend/sv/inc/bottom.htm
 40fcefb3zGC9XNBkSwTEobCoq8YClA tools/python/xen/xend/sv/inc/style.css
-40fcefb4oxovdYkUvExZSkHN0cy_Ow tools/python/xen/xend/sv/inc/top.htm
 40fcefb4rnaZNjqsBu7A5V2rlLyqRw tools/python/xen/xend/sv/util.py
 40c9c469LNxLVizOUpOjEaTKKCm8Aw tools/python/xen/xend/sxp.py
 40d05079aFRp6NQdo5wIh5Ly31c0cg tools/python/xen/xm/__init__.py
diff --git a/tools/python/setup.py b/tools/python/setup.py
index 93e7cad00cafc60a5e1cf13d24bbc644f378143c..d36f9177b99978c533da7e007e4b05cd0e27f609 100644 (file)
--- a/tools/python/setup.py
+++ b/tools/python/setup.py
@@ -41,6 +41,7 @@ setup(name            = 'xen',
                          'xen.util',
                          'xen.xend',
                          'xen.xend.server',
+                         'xen.xend.sv',
                          'xen.xm',
                          ],
       ext_package = "xen.lowlevel",
diff --git a/tools/python/xen/xend/sv/HTMLBase.py b/tools/python/xen/xend/sv/HTMLBase.py
index da8c03b3668f2d8540e7c239a3d4ac7b10c24c2b..e127dedac623b34013c0d910c3ac2e1eb9fd6d7c 100755 (executable)
--- a/tools/python/xen/xend/sv/HTMLBase.py
+++ b/tools/python/xen/xend/sv/HTMLBase.py
@@ -4,8 +4,6 @@ from twisted.internet import reactor
 class HTMLBase( resource.Resource ):
        
     isLeaf = True
-    
-    defaultPath = "/usr/lib/python2.2/site-packages/xen/xend/sv/"
                
     def __init__( self ):
         resource.Resource.__init__(self)
@@ -22,9 +20,8 @@ class HTMLBase( resource.Resource ):
                request.write( "BODY" )
         
     def write_TOP( self, request ):
-        f = open( self.defaultPath + 'inc/top.htm', 'r' )
-        request.write( f.read() )
+        request.write( '<html><head><title>Xen</title><link rel="stylesheet" type="text/css" href="inc/style.css" />' )
+        request.write( '</head><body>' )
 
     def write_BOTTOM( self, request ):
-        f = open( self.defaultPath + 'inc/bottom.htm', 'r' )
-        request.write( f.read() )
\ No newline at end of file
+        request.write( "</body></html>" )
\ No newline at end of file
diff --git a/tools/python/xen/xend/sv/inc/bottom.htm b/tools/python/xen/xend/sv/inc/bottom.htm
deleted file mode 100755 (executable)
index 4d4a7e5..0000000
--- a/tools/python/xen/xend/sv/inc/bottom.htm
+++ /dev/null
@@ -1,2 +0,0 @@
-       </body>
-</html>
\ No newline at end of file
diff --git a/tools/python/xen/xend/sv/inc/top.htm b/tools/python/xen/xend/sv/inc/top.htm
deleted file mode 100755 (executable)
index ace62cb..0000000
--- a/tools/python/xen/xend/sv/inc/top.htm
+++ /dev/null
@@ -1,8 +0,0 @@
-<html>
-    <head>
-        <title>
-            Xen
-        </title>
-        <link rel="stylesheet" type="text/css" href="inc/style.css" />
-    </head>
-       <body>
\ No newline at end of file
Unnamed repository; edit this file 'description' to name the repository.